From 629dcd3dcfb39149cfd0dc162fb233eef572dd65 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 10 Jan 2022 15:04:57 +0800 Subject: [PATCH] meson.build: Don't apply iso-codes cflag on Windows They are no longer applicable for Windows builds. --- meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 90619713d5..a40473c12a 100644 --- a/meson.build +++ b/meson.build @@ -455,10 +455,12 @@ cdata.set('HAVE_TRACKER3', tracker3_dep.found()) colord_dep = dependency('colord', version: '>= 0.1.9', required: get_option('colord')) cdata.set('HAVE_COLORD', colord_dep.found()) -if iso_codes_dep.found() - cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_variable(pkgconfig: 'prefix')) -else - cdata.set_quoted('ISO_CODES_PREFIX', '/usr') +if not os_win32 + if iso_codes_dep.found() + cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_variable(pkgconfig: 'prefix')) + else + cdata.set_quoted('ISO_CODES_PREFIX', '/usr') + endif endif -- 2.30.2